Merge branch 'version-3.0.1'v3.0.1

1 files changed, 100 insertions, 95 deletions

diff --git a/locale/sr.UTF-8/LC_MESSAGES/FixMyStreet.po b/locale/sr.UTF-8/LC_MESSAGES/FixMyStreet.po
index ba726626b..07fa25ed3 100644
--- a/locale/sr.UTF-8/LC_MESSAGES/FixMyStreet.po
+++ b/locale/sr.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: Serbian (https://www.transifex.com/mysociety/teams/12067/sr/)\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 "i"
 
@@ -183,8 +183,8 @@ msgstr "(poslato oboma)"
 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 "-- Izaberi kategoriju --"
@@ -225,7 +225,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 "<label for=\"statuses\">prikaži</label> %s <label for=\"filter_categories\">o</label> %s"
@@ -291,7 +291,7 @@ msgstr ""
 msgid "Add a contact using the form below."
 msgstr "Dodaj kontakt korišćenjem obrasca ispod."
 
-#: 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 "Dodaj novu kategoriju"
@@ -368,7 +368,7 @@ msgstr "Dodato %s"
 msgid "Adding this report to your shortlist will remove it from %s’s shortlist."
 msgstr "Dodavanjem ove prijave u vaš uži krug uklonićete ga iz užeg kruga %s."
 
-#: templates/web/base/main_nav_items.html:39
+#: templates/web/base/main_nav_items.html:31
 msgid "Admin"
 msgstr ""
 
@@ -678,12 +678,12 @@ msgstr "Kategorija je promenjena sa  ‘%s’ na ‘%s’"
 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 "Norma rešavanja problema stari > od 4 nedelje "
 
 #: 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 "Norma rešavanja problema stari > od 4 nedelje "
 
@@ -942,7 +942,7 @@ msgstr "Kreiraj izveštaj"
 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 "Kreiraj kategoriju"
@@ -1377,7 +1377,7 @@ msgstr "Završna tačka"
 msgid "Enter a Zürich street name"
 msgstr "Unesi Z&uuml;rich naziv ulice"
 
-#: perllib/FixMyStreet/Cobrand/UK.pm:21
+#: perllib/FixMyStreet/Cobrand/UK.pm:22
 msgid "Enter a nearby UK postcode, or street name and area"
 msgstr "Unesi naziv obližnje ulice ili oblasti"
 
@@ -1472,7 +1472,7 @@ msgstr "Spoljni tim"
 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
@@ -1678,7 +1678,7 @@ msgstr "Šaljete upitnik?"
 msgid "Grant access to the admin"
 msgstr "Dozvolite pristup administratoru"
 
-#: 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 "Grafikon kreiranja problema po statusu duž vremena"
 
@@ -1698,12 +1698,12 @@ msgstr "Da li je ovaj problem rešen?"
 msgid "Have you ever reported a problem to a council before, or is this your first time?"
 msgstr "Da li ste ikada problem prijavili savetu ili je ovo prvi put?"
 
-#: 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
@@ -1926,7 +1926,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 ""
 
@@ -2073,7 +2073,7 @@ msgstr "Navedi sve prijavljene probleme"
 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..."
@@ -2091,8 +2091,8 @@ msgstr "Lokalna obaveštenja"
 msgid "Local RSS feeds and email alerts for ‘%s’"
 msgstr "Local RSS feeds and email alerts for ‘%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 "Lokalna obaveštenja"
 
@@ -2328,7 +2328,7 @@ msgstr ""
 msgid "New body added"
 msgstr "Dodata nova direkcija"
 
-#: perllib/FixMyStreet/App/Controller/Admin/Bodies.pm:316
+#: perllib/FixMyStreet/App/Controller/Admin/Bodies.pm:321
 msgid "New category contact added"
 msgstr "Dodata nova kontakt kategorija"
 
@@ -2684,15 +2684,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 "Drugi"
 
@@ -2722,7 +2722,7 @@ msgstr "Strana nije nađena"
 msgid "Parent"
 msgstr "Izvor"
 
-#: templates/web/base/admin/bodies/contact-form.html:91
+#: templates/web/base/admin/bodies/contact-form.html:98
 #, fuzzy
 msgid "Parent categories"
 msgstr "Sve kategorije"
@@ -2883,8 +2883,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 "Molimo vas izaberite kategoriju"
@@ -2894,7 +2894,7 @@ msgstr "Molimo vas izaberite kategoriju"
 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
@@ -2914,7 +2914,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"
@@ -2933,7 +2933,7 @@ msgstr ""
 msgid "Please enter a name"
 msgstr "Molimo vas unesite ime"
 
-#: 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 "Molimo vas unesite naziv ovog tela"
 
@@ -2995,7 +2995,7 @@ msgid "Please enter your first name"
 msgstr "Molimo vas unesite vaše ime"
 
 #. ("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 "Molimo vas unesite vaše ime, skupština treba ove informacije – ukoliko ne želite da vam se ime prikazuje na stranici, skinite znak štikliranja iz polja ispod "
@@ -3200,7 +3200,7 @@ msgstr "Prioriteti"
 msgid "Priority"
 msgstr "Prioritet"
 
-#: templates/web/base/main_nav_items.html:35
+#: templates/web/base/main_nav_items.html:27
 msgid "Privacy"
 msgstr "Privatnost"
 
@@ -3213,7 +3213,7 @@ msgstr "Privatnost i kolačići"
 #: 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 "Privatan"
 
@@ -3257,13 +3257,13 @@ msgstr "Ukloni iz užeg kruga"
 msgid "Problem %s sent to council %s"
 msgstr "Problem %s poslat skupštini %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 "Pregled problema po stanju"
 
-#: perllib/FixMyStreet/App/Controller/Admin.pm:276
+#: perllib/FixMyStreet/App/Controller/Admin.pm:244
 msgid "Problem marked as open."
 msgstr "Problem označen kao otvoren."
 
@@ -3299,16 +3299,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 "Problemi u okviru %s"
 
-#: perllib/FixMyStreet/Cobrand/UK.pm:240
+#: perllib/FixMyStreet/Cobrand/UK.pm:234
 msgid "Problems within %s ward"
 msgstr "Problemi u okviru %s naselja"
 
-#: 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 ""
 
@@ -3328,6 +3328,10 @@ msgstr "Adresa imovine:"
 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
@@ -3398,11 +3402,11 @@ msgstr "Upitnik popunio podnosilac problema "
 msgid "RSS feed"
 msgstr "RSS vesti"
 
-#: 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 "RSS vesti %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 "RSS vesti za %s naselje, %s"
 
@@ -3410,11 +3414,11 @@ msgstr "RSS vesti za %s naselje, %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 "RSS vesti %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 "RSS vesti %s, u okviru %s naselja"
 
@@ -3424,11 +3428,11 @@ msgstr "RSS vesti o obližnjim problemima"
 
 #: 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 "RSS vesti %s, u okviru %s "
 
-#: perllib/FixMyStreet/Cobrand/UK.pm:239
+#: perllib/FixMyStreet/Cobrand/UK.pm:233
 msgid "RSS feed of problems within %s ward"
 msgstr "RSS vesti %s, u okviru %s naselja"
 
@@ -3541,15 +3545,16 @@ msgstr "ID prijave:"
 #. ("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 "Prijavi problem"
 
 #. ("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 ""
 
@@ -3565,7 +3570,7 @@ msgstr "Prijavljeni anonimno u %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 ""
@@ -3706,11 +3711,11 @@ msgstr "Objavljene prijave"
 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 ""
 
@@ -3799,15 +3804,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 "Okreni levo"
 
-#: 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
@@ -3829,7 +3834,7 @@ msgstr "Satelitski"
 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
@@ -3992,7 +3997,7 @@ msgstr "Podeli"
 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
@@ -4062,7 +4067,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"
@@ -4122,8 +4127,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 "Izvinite, ovo je Crown poštanski broj koji ne pokrivamo."
 
@@ -4143,7 +4148,7 @@ msgstr "Izvinite, nastala je greška u potvrđivanju vašeg problema."
 
 #: 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 "Izvinite, nismo mogli da nađemo datu lokaciju."
 
@@ -4251,7 +4256,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
@@ -4301,9 +4305,10 @@ msgstr "Predmet"
 #: 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 "Podnesi"
@@ -4367,7 +4372,7 @@ msgstr ""
 msgid "Summarise the problem"
 msgstr "Rezimiraj problem"
 
-#: templates/web/base/admin/bodies/contact-form.html:116
+#: templates/web/base/admin/bodies/contact-form.html:123
 msgid "Summarise your changes"
 msgstr "Rezimiraj vaše promene"
 
@@ -4389,7 +4394,7 @@ msgstr "Rezime"
 msgid "Summary reports"
 msgstr "Kratki izveštaji"
 
-#: 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 ""
@@ -4402,7 +4407,7 @@ msgstr "Superkorisnik:"
 msgid "Superusers have permission to perform <strong>all actions</strong> within the admin."
 msgstr "Superkorisnici imaju dozvolu da obave <strong>sve radnje</strong> u sklopu admin."
 
-#: 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 "Rezultati ankete"
@@ -4491,16 +4496,16 @@ msgstr "Po svemu sudeći data lokacija nije na Kosovu; molimo vas pokušajte pon
 #: 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 "Dati poštanski broj nije prepoznat, izvinite."
 
-#: 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 "Dati problem obeležen je kao poslat."
 
-#: perllib/FixMyStreet/App/Controller/Admin/Reports.pm:263
+#: perllib/FixMyStreet/App/Controller/Admin/Reports.pm:265
 msgid "That problem will now be resent."
 msgstr "Dati problem će sada biti ponovo poslat."
 
@@ -4552,8 +4557,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 ""
@@ -4666,7 +4671,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 "Korisnik nije mogao da pronađe problem na mapi, već samo da vidi oblast oko lokacije koju su uneli "
 
@@ -4728,12 +4733,12 @@ msgstr "Nastao je problem u prikazivanju ove strane. Molimo vas probajte ponovo
 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 "Bilo je problema sa vašim ažuriranjem. Molimo vas pokušajte ponovo."
 
@@ -4741,7 +4746,7 @@ msgstr "Bilo je problema sa vašim ažuriranjem. Molimo vas pokušajte ponovo."
 msgid "There were problems with your report. Please see below."
 msgstr "Ima problema sa vašom prijavom. Molimo vas vidite ispod."
 
-#: 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 "Ima problema sa vašom prijavom. Molimo vas vidite ispod."
 
@@ -4818,18 +4823,18 @@ msgstr ""
 "Ovoj direkciji šalju se samo one prijave o problemima koji se nalaze u  <strong>pokrivenoj oblasti</strong>.\n"
 "Direkcija neće primati nikakve prijave, sem u slučaju da pokriva najmanje jednu oblast ."
 
-#: 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 "Ovaj e-mejl poslat je obema direkcijama koje pokrivaju lokaciju problema, pošto je korisnik nije klasifikovao; molimo vas ignorišite je ukoliko niste prava direkcija koja treba da se pozabavi ovim pitanjem ili nam stavite na znanje koje je kategorije ovaj problem kako bismo mogli da ga dodamo u naš sistem."
 
-#: 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 "Ovaj e-mejl poslat je nekolicini skupština koje pokrivaju lokaciju problema, pošto je odabrana kategorija pružena za sve njih; molimo vas ignorišite je ukoliko niste ispravna direkcija da se pozabavi ovim pitanjem."
 
-#: 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 "Ova informacija je tražena"
 
@@ -4894,7 +4899,7 @@ msgstr "Ova prijava trenutno je obeležena kao otvorena."
 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 "Ova internet stranica takođe sadrži fotografiju problema, koju je korisnik podneo."
 
@@ -4950,7 +4955,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 "Da pogledate mapu sa preciznom lokacijom ovog pitanja"
 
@@ -5142,8 +5147,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
@@ -5266,8 +5271,8 @@ msgid "Users with this role can perform the following actions within their assig
 msgstr "Korisnici mogu obaviti sledeće radnje u sklopu njima dodeljene direkcije ili oblasti."
 
 #: 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 "Ažurirane vrednosti"
 
@@ -5342,7 +5347,7 @@ msgstr ""
 msgid "We need your email address, please give it below."
 msgstr "Treba nam vaša e-mejl adresa, molimo vas navedite je u nastavku."
 
-#: 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 "Shvatamo da je ovaj problem odgovornost %s; međutim, u ovom trenutku nemamo nikakve kontakt podatke o njima. Ukoliko vam je poznata bilo kakva odgovarajuća kontakt adresa, molimo vas stupite sa nama u kontakt."
 
@@ -5597,7 +5602,7 @@ msgstr ""
 #: 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 ""
 
@@ -5741,7 +5746,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"
@@ -5796,7 +5801,7 @@ msgstr ""
 msgid "less than a minute"
 msgstr ""
 
-#: 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"
@@ -5878,7 +5883,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 ""