Merge branch 'version-2.4.1'v2.4.1

1 files changed, 74 insertions, 70 deletions

diff --git a/locale/FixMyStreet.po b/locale/FixMyStreet.po
index 608c03b6d..fca9eb89f 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: 2018-09-06 21:17+0100\n"
+"POT-Creation-Date: 2018-10-01 11:47+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"
@@ -159,7 +159,7 @@ msgstr ""
 msgid "(we also have RSS feeds for problems within %s)"
 msgstr ""
 
-#: perllib/FixMyStreet/App/Controller/Report/New.pm:251 perllib/FixMyStreet/App/Controller/Report/New.pm:701 perllib/FixMyStreet/DB/Result/Problem.pm:381
+#: perllib/FixMyStreet/App/Controller/Report/New.pm:251 perllib/FixMyStreet/App/Controller/Report/New.pm:707 perllib/FixMyStreet/DB/Result/Problem.pm:381
 msgid "-- Pick a category --"
 msgstr ""
 
@@ -282,7 +282,7 @@ msgstr ""
 msgid "Add phone number"
 msgstr ""
 
-#: templates/web/base/report/_item.html:10 templates/web/base/report/_item.html:16 templates/web/base/report/_main.html:134 templates/web/base/report/_main.html:17 templates/web/base/report/_main.html:28
+#: templates/web/base/report/_item.html:10 templates/web/base/report/_item.html:16 templates/web/base/report/_main.html:138 templates/web/base/report/_main.html:20 templates/web/base/report/_main.html:31
 msgid "Add to shortlist"
 msgstr ""
 
@@ -302,11 +302,11 @@ msgstr ""
 msgid "Add/edit response templates"
 msgstr ""
 
-#: templates/web/base/my/my.html:109
+#: templates/web/base/my/my.html:115
 msgid "Added %s"
 msgstr ""
 
-#: templates/web/base/report/_main.html:143
+#: templates/web/base/report/_main.html:147
 msgid "Adding this report to your shortlist will remove it from %s’s shortlist."
 msgstr ""
 
@@ -482,7 +482,7 @@ msgstr ""
 msgid "Back"
 msgstr ""
 
-#: templates/web/base/report/_main.html:4
+#: templates/web/base/report/_main.html:7
 msgid "Back to all reports"
 msgstr ""
 
@@ -490,7 +490,7 @@ msgstr ""
 msgid "Ban user"
 msgstr ""
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:655 perllib/FixMyStreet/Cobrand/Default.pm:740 perllib/FixMyStreet/Cobrand/Zurich.pm:383 templates/web/base/admin/bodies.html:1 templates/web/base/admin/report_edit.html:56 templates/web/zurich/header.html:49
+#: perllib/FixMyStreet/Cobrand/Default.pm:655 perllib/FixMyStreet/Cobrand/Default.pm:740 perllib/FixMyStreet/Cobrand/Zurich.pm:408 templates/web/base/admin/bodies.html:1 templates/web/base/admin/report_edit.html:56 templates/web/zurich/header.html:49
 msgid "Bodies"
 msgstr ""
 
@@ -554,7 +554,7 @@ msgstr ""
 msgid "Change email address"
 msgstr ""
 
-#: templates/web/base/auth/change_password.html:1 templates/web/base/auth/change_password.html:5 templates/web/base/my/my.html:63
+#: templates/web/base/auth/change_password.html:1 templates/web/base/auth/change_password.html:5 templates/web/base/my/my.html:65
 msgid "Change password"
 msgstr ""
 
@@ -651,7 +651,7 @@ msgstr ""
 msgid "Collapse map"
 msgstr ""
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:650 perllib/FixMyStreet/Cobrand/Zurich.pm:397 templates/web/base/admin/config_page.html:1
+#: perllib/FixMyStreet/Cobrand/Default.pm:650 perllib/FixMyStreet/Cobrand/Zurich.pm:422 templates/web/base/admin/config_page.html:1
 msgid "Configuration"
 msgstr ""
 
@@ -700,7 +700,7 @@ msgstr ""
 msgid "Coordinates:"
 msgstr ""
 
-#: perllib/FixMyStreet/App/Controller/Admin.pm:2008 perllib/FixMyStreet/App/Controller/Admin.pm:2037
+#: perllib/FixMyStreet/App/Controller/Admin.pm:2009 perllib/FixMyStreet/App/Controller/Admin.pm:2038
 msgid "Could not find user"
 msgstr ""
 
@@ -788,7 +788,7 @@ msgstr ""
 msgid "Currently no bodies have been created."
 msgstr ""
 
-#: perllib/FixMyStreet/Cobrand/Zurich.pm:846 templates/web/zurich/admin/report_edit-sdm.html:105
+#: perllib/FixMyStreet/Cobrand/Zurich.pm:871 templates/web/zurich/admin/report_edit-sdm.html:105
 msgid "Customer not contactable"
 msgstr ""
 
@@ -824,7 +824,7 @@ msgstr ""
 msgid "Deleted"
 msgstr ""
 
-#: templates/web/base/report/_main.html:111 templates/web/base/report/update.html:51
+#: templates/web/base/report/_main.html:115 templates/web/base/report/update.html:51
 msgid "Describe why you are moderating this"
 msgstr ""
 
@@ -864,7 +864,7 @@ msgstr ""
 msgid "Diligency prize league table"
 msgstr ""
 
-#: templates/web/base/report/_main.html:116 templates/web/base/report/update.html:54
+#: templates/web/base/report/_main.html:120 templates/web/base/report/update.html:54
 msgid "Discard changes"
 msgstr ""
 
@@ -1213,11 +1213,11 @@ msgstr ""
 msgid "Forgotten your password?"
 msgstr ""
 
-#: perllib/FixMyStreet/Cobrand/Zurich.pm:761
+#: perllib/FixMyStreet/Cobrand/Zurich.pm:786
 msgid "Forwarded to external body"
 msgstr ""
 
-#: perllib/FixMyStreet/Cobrand/Zurich.pm:762
+#: perllib/FixMyStreet/Cobrand/Zurich.pm:787
 msgid "Forwarded wish to external body"
 msgstr ""
 
@@ -1317,7 +1317,7 @@ msgstr ""
 msgid "Hide all reports and updates"
 msgstr ""
 
-#: templates/web/base/report/_main.html:107
+#: templates/web/base/report/_main.html:111
 msgid "Hide entire report"
 msgstr ""
 
@@ -1711,7 +1711,7 @@ msgstr ""
 msgid "Missing jurisdiction_id"
 msgstr ""
 
-#: templates/web/base/report/_main.html:128
+#: templates/web/base/report/_main.html:132
 msgid "Moderate"
 msgstr ""
 
@@ -1719,7 +1719,7 @@ msgstr ""
 msgid "Moderate report details"
 msgstr ""
 
-#: templates/web/base/report/_main.html:128
+#: templates/web/base/report/_main.html:132
 msgid "Moderate this report"
 msgstr ""
 
@@ -1727,7 +1727,7 @@ msgstr ""
 msgid "Moderate this update"
 msgstr ""
 
-#: templates/web/base/report/_main.html:71 templates/web/base/report/_update_state.html:19
+#: templates/web/base/report/_main.html:75 templates/web/base/report/_update_state.html:19
 msgid "Moderated by %s at %s"
 msgstr ""
 
@@ -2049,7 +2049,7 @@ msgstr ""
 msgid "Order"
 msgstr ""
 
-#: perllib/FixMyStreet/App/Controller/Report/New.pm:1322 perllib/FixMyStreet/App/Controller/Report/New.pm:702 perllib/FixMyStreet/App/Controller/Report/New.pm:703 perllib/FixMyStreet/App/Controller/Report/New.pm:738 perllib/FixMyStreet/App/Controller/Report/New.pm:741 perllib/FixMyStreet/DB/Result/Problem.pm:600 perllib/FixMyStreet/DB/Result/Problem.pm:607 perllib/FixMyStreet/DB/Result/Problem.pm:622 perllib/FixMyStreet/DB/Result/Problem.pm:631 perllib/FixMyStreet/Script/Reports.pm:182 perllib/FixMyStreet/Script/Reports.pm:189
+#: perllib/FixMyStreet/App/Controller/Report/New.pm:1329 perllib/FixMyStreet/App/Controller/Report/New.pm:708 perllib/FixMyStreet/App/Controller/Report/New.pm:709 perllib/FixMyStreet/App/Controller/Report/New.pm:744 perllib/FixMyStreet/App/Controller/Report/New.pm:747 perllib/FixMyStreet/DB/Result/Problem.pm:600 perllib/FixMyStreet/DB/Result/Problem.pm:607 perllib/FixMyStreet/DB/Result/Problem.pm:622 perllib/FixMyStreet/DB/Result/Problem.pm:631 perllib/FixMyStreet/Script/Reports.pm:182 perllib/FixMyStreet/Script/Reports.pm:189
 msgid "Other"
 msgstr ""
 
@@ -2121,7 +2121,7 @@ msgstr ""
 msgid "Photo"
 msgstr ""
 
-#: perllib/FixMyStreet/App/Controller/Photo.pm:186
+#: perllib/FixMyStreet/App/Controller/Photo.pm:192
 msgid "Photo is required."
 msgstr ""
 
@@ -2129,6 +2129,10 @@ msgstr ""
 msgid "Photo required"
 msgstr ""
 
+#: perllib/FixMyStreet/App/Controller/Photo.pm:109
+msgid "Photo upload failed."
+msgstr ""
+
 #: templates/web/base/questionnaire/index.html:78 templates/web/base/report/new/form_report.html:27 templates/web/base/report/update/form_update.html:7 templates/web/zurich/report/new/fill_in_details_form.html:20
 msgid "Photos"
 msgstr ""
@@ -2165,7 +2169,7 @@ msgstr ""
 msgid "Please check your phone number is correct"
 msgstr ""
 
-#: perllib/FixMyStreet/App/Controller/Admin.pm:315 perllib/FixMyStreet/App/Controller/Report/New.pm:947 perllib/FixMyStreet/App/Controller/Report/New.pm:982 perllib/FixMyStreet/DB/Result/Problem.pm:383 templates/web/base/js/translation_strings.html:13
+#: perllib/FixMyStreet/App/Controller/Admin.pm:315 perllib/FixMyStreet/App/Controller/Report/New.pm:954 perllib/FixMyStreet/App/Controller/Report/New.pm:989 perllib/FixMyStreet/DB/Result/Problem.pm:383 templates/web/base/js/translation_strings.html:13
 msgid "Please choose a category"
 msgstr ""
 
@@ -2336,7 +2340,7 @@ msgstr ""
 msgid "Please state whether or not the problem has been fixed"
 msgstr ""
 
-#: perllib/FixMyStreet/App/Model/PhotoSet.pm:122 perllib/FixMyStreet/App/Model/PhotoSet.pm:156 perllib/FixMyStreet/App/Model/PhotoSet.pm:158 templates/web/base/js/translation_strings.html:68
+#: perllib/FixMyStreet/App/Model/PhotoSet.pm:114 perllib/FixMyStreet/App/Model/PhotoSet.pm:148 perllib/FixMyStreet/App/Model/PhotoSet.pm:150 templates/web/base/js/translation_strings.html:68
 msgid "Please upload an image only"
 msgstr ""
 
@@ -2477,7 +2481,7 @@ msgstr ""
 msgid "Property address:"
 msgstr ""
 
-#: templates/web/base/report/display.html:66 templates/web/base/report/duplicate-no-updates.html:3 templates/web/base/report/update-form.html:9
+#: templates/web/base/report/display.html:67 templates/web/base/report/duplicate-no-updates.html:3 templates/web/base/report/update-form.html:9
 msgid "Provide an update"
 msgstr ""
 
@@ -2610,7 +2614,7 @@ msgstr ""
 msgid "Remove flag"
 msgstr ""
 
-#: templates/web/base/report/_item.html:12 templates/web/base/report/_item.html:9 templates/web/base/report/_main.html:132 templates/web/base/report/_main.html:16 templates/web/base/report/_main.html:24
+#: templates/web/base/report/_item.html:12 templates/web/base/report/_item.html:9 templates/web/base/report/_main.html:136 templates/web/base/report/_main.html:19 templates/web/base/report/_main.html:27
 msgid "Remove from shortlist"
 msgstr ""
 
@@ -2730,7 +2734,7 @@ msgstr ""
 msgid "Reporting a problem"
 msgstr ""
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:660 perllib/FixMyStreet/Cobrand/Default.pm:674 perllib/FixMyStreet/Cobrand/Zurich.pm:375 templates/web/zurich/header.html:45
+#: perllib/FixMyStreet/Cobrand/Default.pm:660 perllib/FixMyStreet/Cobrand/Default.pm:674 perllib/FixMyStreet/Cobrand/Zurich.pm:400 templates/web/zurich/header.html:45
 msgid "Reports"
 msgstr ""
 
@@ -2818,11 +2822,11 @@ msgstr ""
 msgid "Revert to original"
 msgstr ""
 
-#: templates/web/base/report/_main.html:97
+#: templates/web/base/report/_main.html:101
 msgid "Revert to original text"
 msgstr ""
 
-#: templates/web/base/report/_main.html:48
+#: templates/web/base/report/_main.html:50
 msgid "Revert to original title"
 msgstr ""
 
@@ -2838,11 +2842,11 @@ msgstr ""
 msgid "Road operator for this named road (from OpenStreetMap): %s"
 msgstr ""
 
-#: perllib/FixMyStreet/App/Controller/Admin.pm:2082 perllib/FixMyStreet/App/Controller/Admin.pm:2086 templates/web/base/admin/report_edit.html:165 templates/web/base/admin/update_edit.html:71 templates/web/zurich/admin/report_edit.html:118
+#: perllib/FixMyStreet/App/Controller/Admin.pm:2083 perllib/FixMyStreet/App/Controller/Admin.pm:2087 templates/web/base/admin/report_edit.html:165 templates/web/base/admin/update_edit.html:71 templates/web/zurich/admin/report_edit.html:118
 msgid "Rotate Left"
 msgstr ""
 
-#: perllib/FixMyStreet/App/Controller/Admin.pm:2082 templates/web/base/admin/report_edit.html:166 templates/web/base/admin/update_edit.html:72 templates/web/zurich/admin/report_edit.html:119
+#: perllib/FixMyStreet/App/Controller/Admin.pm:2083 templates/web/base/admin/report_edit.html:166 templates/web/base/admin/update_edit.html:72 templates/web/zurich/admin/report_edit.html:119
 msgid "Rotate Right"
 msgstr ""
 
@@ -2858,7 +2862,7 @@ msgstr ""
 msgid "Save + close as duplicate"
 msgstr ""
 
-#: templates/web/base/admin/contact-form.html:156 templates/web/base/admin/reportextrafields/edit.html:64 templates/web/base/admin/responsepriorities/edit.html:58 templates/web/base/admin/template_edit.html:87 templates/web/base/report/_inspect.html:209 templates/web/base/report/_main.html:115 templates/web/base/report/update.html:53 templates/web/zurich/admin/contact-form.html:49 templates/web/zurich/admin/template_edit.html:29
+#: templates/web/base/admin/contact-form.html:156 templates/web/base/admin/reportextrafields/edit.html:64 templates/web/base/admin/responsepriorities/edit.html:58 templates/web/base/admin/template_edit.html:87 templates/web/base/report/_inspect.html:209 templates/web/base/report/_main.html:119 templates/web/base/report/update.html:53 templates/web/zurich/admin/contact-form.html:49 templates/web/zurich/admin/template_edit.html:29
 msgid "Save changes"
 msgstr ""
 
@@ -2899,7 +2903,7 @@ msgstr ""
 msgid "Searching found no users."
 msgstr ""
 
-#: templates/web/base/auth/generate_token.html:1 templates/web/base/auth/generate_token.html:2 templates/web/base/auth/generate_token.html:39 templates/web/base/my/my.html:65
+#: templates/web/base/auth/generate_token.html:1 templates/web/base/auth/generate_token.html:2 templates/web/base/auth/generate_token.html:39 templates/web/base/my/my.html:71
 msgid "Security"
 msgstr ""
 
@@ -2951,7 +2955,7 @@ msgstr ""
 msgid "Sending a confirmation text failed: \"%s\""
 msgstr ""
 
-#: perllib/FixMyStreet/Cobrand/Zurich.pm:847
+#: perllib/FixMyStreet/Cobrand/Zurich.pm:872
 msgid "Sent report back"
 msgstr ""
 
@@ -2971,7 +2975,7 @@ msgstr ""
 msgid "Service:"
 msgstr ""
 
-#: templates/web/base/auth/change_password.html:1 templates/web/base/auth/change_password.html:4
+#: templates/web/base/auth/change_password.html:1 templates/web/base/auth/change_password.html:4 templates/web/base/my/my.html:67
 msgid "Set password"
 msgstr ""
 
@@ -2983,7 +2987,7 @@ msgstr ""
 msgid "Share"
 msgstr ""
 
-#: templates/web/base/main_nav_items.html:18 templates/web/base/report/_main.html:134 templates/web/base/report/_main.html:19 templates/web/base/report/_main.html:27
+#: templates/web/base/main_nav_items.html:18 templates/web/base/report/_main.html:138 templates/web/base/report/_main.html:22 templates/web/base/report/_main.html:30
 msgid "Shortlist"
 msgstr ""
 
@@ -2991,11 +2995,11 @@ msgstr ""
 msgid "Shortlist all visible"
 msgstr ""
 
-#: templates/web/base/report/_main.html:132 templates/web/base/report/_main.html:18 templates/web/base/report/_main.html:23 templates/web/base/reports/_list-filters.html:24
+#: templates/web/base/report/_main.html:136 templates/web/base/report/_main.html:21 templates/web/base/report/_main.html:26 templates/web/base/reports/_list-filters.html:24
 msgid "Shortlisted"
 msgstr ""
 
-#: templates/web/base/report/_item.html:15 templates/web/base/report/_main.html:142
+#: templates/web/base/report/_item.html:15 templates/web/base/report/_main.html:146
 msgid "Shortlisted by %s"
 msgstr ""
 
@@ -3023,7 +3027,7 @@ msgstr ""
 msgid "Show older reports"
 msgstr ""
 
-#: templates/web/base/report/_main.html:81
+#: templates/web/base/report/_main.html:85
 msgid "Show photo"
 msgstr ""
 
@@ -3031,7 +3035,7 @@ msgstr ""
 msgid "Show pins"
 msgstr ""
 
-#: templates/web/base/report/_main.html:58
+#: templates/web/base/report/_main.html:62
 msgid "Show reporter&rsquo;s name"
 msgstr ""
 
@@ -3055,7 +3059,7 @@ msgstr ""
 msgid "Sign in or create an account"
 msgstr ""
 
-#: templates/web/base/auth/sign_out.html:1 templates/web/base/my/my.html:67 templates/web/zurich/auth/sign_out.html:1
+#: templates/web/base/auth/sign_out.html:1 templates/web/base/my/my.html:73 templates/web/zurich/auth/sign_out.html:1
 msgid "Sign out"
 msgstr ""
 
@@ -3106,7 +3110,7 @@ msgstr ""
 msgid "Sorry, we could not parse that location. Please try again."
 msgstr ""
 
-#: perllib/FixMyStreet/App/Model/PhotoSet.pm:139
+#: perllib/FixMyStreet/App/Model/PhotoSet.pm:131
 msgid "Sorry, we couldn't save your image(s), please try again."
 msgstr ""
 
@@ -3152,11 +3156,11 @@ msgstr ""
 msgid "State:"
 msgstr ""
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:649 perllib/FixMyStreet/Cobrand/Zurich.pm:396 templates/web/base/admin/states/index.html:1
+#: perllib/FixMyStreet/Cobrand/Default.pm:649 perllib/FixMyStreet/Cobrand/Zurich.pm:421 templates/web/base/admin/states/index.html:1
 msgid "States"
 msgstr ""
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:643 perllib/FixMyStreet/Cobrand/Zurich.pm:378 templates/web/base/admin/index.html:71 templates/web/base/admin/stats/index.html:1 templates/web/base/admin/stats/state.html:1 templates/web/zurich/admin/stats/index.html:1 templates/web/zurich/header.html:58
+#: perllib/FixMyStreet/Cobrand/Default.pm:643 perllib/FixMyStreet/Cobrand/Zurich.pm:403 templates/web/base/admin/index.html:71 templates/web/base/admin/stats/index.html:1 templates/web/base/admin/stats/state.html:1 templates/web/zurich/admin/stats/index.html:1 templates/web/zurich/header.html:58
 msgid "Stats"
 msgstr ""
 
@@ -3224,7 +3228,7 @@ msgstr ""
 msgid "Summarise your changes"
 msgstr ""
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:641 perllib/FixMyStreet/Cobrand/Zurich.pm:374 templates/web/base/admin/bodies.html:29 templates/web/base/admin/index.html:1 templates/web/base/status/index.html:1 templates/web/base/status/index.html:3 templates/web/zurich/admin/index-dm.html:1 templates/web/zurich/admin/index-sdm.html:1 templates/web/zurich/admin/index.html:1 templates/web/zurich/footer.html:12 templates/web/zurich/header.html:42
+#: perllib/FixMyStreet/Cobrand/Default.pm:641 perllib/FixMyStreet/Cobrand/Zurich.pm:399 templates/web/base/admin/bodies.html:29 templates/web/base/admin/index.html:1 templates/web/base/status/index.html:1 templates/web/base/status/index.html:3 templates/web/zurich/admin/index-dm.html:1 templates/web/zurich/admin/index-sdm.html:1 templates/web/zurich/admin/index.html:1 templates/web/zurich/footer.html:12 templates/web/zurich/header.html:42
 msgid "Summary"
 msgstr ""
 
@@ -3252,7 +3256,7 @@ msgstr ""
 msgid "Template &laquo;%s&raquo;"
 msgstr ""
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:666 perllib/FixMyStreet/Cobrand/Zurich.pm:385 templates/web/base/develop/email_list.html:3 templates/web/zurich/header.html:62
+#: perllib/FixMyStreet/Cobrand/Default.pm:666 perllib/FixMyStreet/Cobrand/Zurich.pm:410 templates/web/base/develop/email_list.html:3 templates/web/zurich/header.html:62
 msgid "Templates"
 msgstr ""
 
@@ -3296,7 +3300,7 @@ msgstr ""
 msgid "Thanks, glad to hear it's been fixed! Could we just ask if you have ever reported a problem to a council before?"
 msgstr ""
 
-#: perllib/FixMyStreet/App/Model/PhotoSet.pm:163
+#: perllib/FixMyStreet/App/Model/PhotoSet.pm:155
 msgid "That image doesn't appear to have uploaded correctly (%s), please try again."
 msgstr ""
 
@@ -3328,19 +3332,19 @@ msgstr ""
 msgid "That report has been removed from FixMyStreet."
 msgstr ""
 
-#: perllib/FixMyStreet/App/Controller/Admin.pm:1911
+#: perllib/FixMyStreet/App/Controller/Admin.pm:1912
 msgid "That user has been logged out."
 msgstr ""
 
-#: perllib/FixMyStreet/App/Controller/Admin.pm:1918
+#: perllib/FixMyStreet/App/Controller/Admin.pm:1919
 msgid "That user has been made anonymous on all reports and updates."
 msgstr ""
 
-#: perllib/FixMyStreet/App/Controller/Admin.pm:1966
+#: perllib/FixMyStreet/App/Controller/Admin.pm:1967
 msgid "That user’s personal details have been removed."
 msgstr ""
 
-#: perllib/FixMyStreet/App/Controller/Admin.pm:1932
+#: perllib/FixMyStreet/App/Controller/Admin.pm:1933
 msgid "That user’s reports and updates have been hidden."
 msgstr ""
 
@@ -3396,7 +3400,7 @@ msgstr ""
 msgid "The diligency prize league table shows editors' activity (who's been editing the most records)."
 msgstr ""
 
-#: perllib/FixMyStreet/App/Controller/Dashboard.pm:43 perllib/FixMyStreet/App/Controller/Reports.pm:84
+#: perllib/FixMyStreet/App/Controller/Dashboard.pm:43 perllib/FixMyStreet/App/Controller/Reports.pm:58
 msgid "The error was: %s"
 msgstr ""
 
@@ -3468,7 +3472,7 @@ msgstr ""
 msgid "The user could not locate the problem on a map, but to see the area around the location they entered"
 msgstr ""
 
-#: perllib/FixMyStreet/App/Controller/Admin.pm:1957
+#: perllib/FixMyStreet/App/Controller/Admin.pm:1958
 msgid "The user has been sent a login email"
 msgstr ""
 
@@ -3486,7 +3490,7 @@ msgstr ""
 msgid "There is already an auto-response template for this category/state."
 msgstr ""
 
-#: perllib/FixMyStreet/App/Controller/Reports.pm:81
+#: perllib/FixMyStreet/App/Controller/Reports.pm:55
 msgid "There was a problem showing the All Reports page. Please try again later."
 msgstr ""
 
@@ -3498,11 +3502,11 @@ msgstr ""
 msgid "There was a problem with your email/password combination. Please try again."
 msgstr ""
 
-#: perllib/FixMyStreet/App/Controller/Report/New.pm:835 perllib/FixMyStreet/App/Controller/Report/Update.pm:142 templates/web/base/auth/general.html:51 templates/web/zurich/auth/general.html:18
+#: perllib/FixMyStreet/App/Controller/Report/New.pm:843 perllib/FixMyStreet/App/Controller/Report/Update.pm:142 templates/web/base/auth/general.html:51 templates/web/zurich/auth/general.html:18
 msgid "There was a problem with your login information. If you cannot remember your password, or do not have one, please fill in the &lsquo;No&rsquo; section of the form."
 msgstr ""
 
-#: perllib/FixMyStreet/App/Controller/Report/Update.pm:349
+#: perllib/FixMyStreet/App/Controller/Report/Update.pm:350
 msgid "There was a problem with your update. Please try again."
 msgstr ""
 
@@ -3510,7 +3514,7 @@ msgstr ""
 msgid "There were problems with your report. Please see below."
 msgstr ""
 
-#: perllib/FixMyStreet/App/Controller/Report/Update.pm:390
+#: perllib/FixMyStreet/App/Controller/Report/Update.pm:391
 msgid "There were problems with your update. Please see below."
 msgstr ""
 
@@ -3572,7 +3576,7 @@ 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:1057 perllib/FixMyStreet/App/Controller/Report/New.pm:1074 perllib/FixMyStreet/App/Controller/Report/New.pm:1120 perllib/FixMyStreet/App/Controller/Report/New.pm:996 perllib/FixMyStreet/Cobrand/UK.pm:45
+#: perllib/FixMyStreet/App/Controller/Report/New.pm:1003 perllib/FixMyStreet/App/Controller/Report/New.pm:1064 perllib/FixMyStreet/App/Controller/Report/New.pm:1081 perllib/FixMyStreet/App/Controller/Report/New.pm:1127 perllib/FixMyStreet/Cobrand/UK.pm:45
 msgid "This information is required"
 msgstr ""
 
@@ -3752,7 +3756,7 @@ msgstr ""
 msgid "Unknown alert type"
 msgstr ""
 
-#: perllib/FixMyStreet/App/Controller/Photo.pm:109 perllib/FixMyStreet/App/Controller/Root.pm:142 templates/web/base/js/translation_strings.html:46
+#: perllib/FixMyStreet/App/Controller/Photo.pm:115 perllib/FixMyStreet/App/Controller/Root.pm:142 templates/web/base/js/translation_strings.html:46
 msgid "Unknown error"
 msgstr ""
 
@@ -3828,7 +3832,7 @@ msgstr ""
 msgid "Updated by <strong>%s</strong> at %s"
 msgstr ""
 
-#: perllib/FixMyStreet/App/Controller/Admin.pm:1358 perllib/FixMyStreet/App/Controller/Admin.pm:1473 perllib/FixMyStreet/App/Controller/Admin.pm:1679 perllib/FixMyStreet/App/Controller/Admin.pm:997 perllib/FixMyStreet/Cobrand/Zurich.pm:780 perllib/FixMyStreet/Cobrand/Zurich.pm:805 perllib/FixMyStreet/Cobrand/Zurich.pm:878
+#: perllib/FixMyStreet/App/Controller/Admin.pm:1358 perllib/FixMyStreet/App/Controller/Admin.pm:1473 perllib/FixMyStreet/App/Controller/Admin.pm:1680 perllib/FixMyStreet/App/Controller/Admin.pm:997 perllib/FixMyStreet/Cobrand/Zurich.pm:805 perllib/FixMyStreet/Cobrand/Zurich.pm:830 perllib/FixMyStreet/Cobrand/Zurich.pm:903
 msgid "Updated!"
 msgstr ""
 
@@ -3887,7 +3891,7 @@ msgstr ""
 msgid "User Import"
 msgstr ""
 
-#: perllib/FixMyStreet/App/Controller/Admin.pm:1888 perllib/FixMyStreet/App/Controller/Admin.pm:1898
+#: perllib/FixMyStreet/App/Controller/Admin.pm:1889 perllib/FixMyStreet/App/Controller/Admin.pm:1899
 msgid "User added to abuse list"
 msgstr ""
 
@@ -3895,15 +3899,15 @@ msgstr ""
 msgid "User already exists"
 msgstr ""
 
-#: perllib/FixMyStreet/App/Controller/Admin.pm:1885 perllib/FixMyStreet/App/Controller/Admin.pm:1895
+#: perllib/FixMyStreet/App/Controller/Admin.pm:1886 perllib/FixMyStreet/App/Controller/Admin.pm:1896
 msgid "User already in abuse list"
 msgstr ""
 
-#: perllib/FixMyStreet/App/Controller/Admin.pm:2041
+#: perllib/FixMyStreet/App/Controller/Admin.pm:2042
 msgid "User flag removed"
 msgstr ""
 
-#: perllib/FixMyStreet/App/Controller/Admin.pm:2012
+#: perllib/FixMyStreet/App/Controller/Admin.pm:2013
 msgid "User flagged"
 msgstr ""
 
@@ -3919,7 +3923,7 @@ msgstr ""
 msgid "User:"
 msgstr ""
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:675 perllib/FixMyStreet/Cobrand/Default.pm:734 perllib/FixMyStreet/Cobrand/Zurich.pm:390 templates/web/base/admin/flagged.html:29 templates/web/zurich/header.html:54
+#: perllib/FixMyStreet/Cobrand/Default.pm:675 perllib/FixMyStreet/Cobrand/Default.pm:734 perllib/FixMyStreet/Cobrand/Zurich.pm:415 templates/web/base/admin/flagged.html:29 templates/web/zurich/header.html:54
 msgid "Users"
 msgstr ""
 
@@ -4178,7 +4182,7 @@ msgstr ""
 msgid "You have successfully verified your phone number."
 msgstr ""
 
-#: templates/web/base/my/my.html:73
+#: templates/web/base/my/my.html:79
 msgid "You haven&rsquo;t created any reports yet.  <a href=\"%s\">Report a problem now.</a>"
 msgstr ""
 
@@ -4261,7 +4265,7 @@ msgstr ""
 msgid "Your report"
 msgstr ""
 
-#: templates/web/base/my/my.html:70
+#: templates/web/base/my/my.html:76
 msgid "Your reports"
 msgstr ""
 
@@ -4277,7 +4281,7 @@ msgstr ""
 msgid "Your update has been saved offline for submission when back online."
 msgstr ""
 
-#: templates/web/base/my/my.html:93
+#: templates/web/base/my/my.html:99
 msgid "Your updates"
 msgstr ""
 
@@ -4301,7 +4305,7 @@ msgstr ""
 msgid "all"
 msgstr ""
 
-#: perllib/FixMyStreet/App/Controller/Admin.pm:973 perllib/FixMyStreet/App/Controller/Moderate.pm:88 perllib/FixMyStreet/DB/Result/Comment.pm:216 perllib/FixMyStreet/Script/ArchiveOldEnquiries.pm:145
+#: perllib/FixMyStreet/App/Controller/Admin.pm:973 perllib/FixMyStreet/App/Controller/Moderate.pm:90 perllib/FixMyStreet/DB/Result/Comment.pm:216 perllib/FixMyStreet/Script/ArchiveOldEnquiries.pm:145
 msgid "an administrator"
 msgstr ""
 
@@ -4425,11 +4429,11 @@ msgstr ""
 msgid "user is problem owner"
 msgstr ""
 
-#: perllib/FixMyStreet/App/Controller/Admin.pm:1985
+#: perllib/FixMyStreet/App/Controller/Admin.pm:1986
 msgid "user not in abuse list"
 msgstr ""
 
-#: perllib/FixMyStreet/App/Controller/Admin.pm:1983
+#: perllib/FixMyStreet/App/Controller/Admin.pm:1984
 msgid "user removed from abuse list"
 msgstr ""